From 65cb849092a0e0d6f6cc3c6d16c710f6e6dd86fa Mon Sep 17 00:00:00 2001 From: "kaf24@scramble.cl.cam.ac.uk" Date: Fri, 20 Feb 2004 16:13:18 +0000 Subject: [PATCH] bitkeeper revision 1.736 (4036321eiozM1XWsrgEFsYgqQdvc8A) memory.c, traps.c: Fix LDT demand-shadowing. --- xen/arch/i386/traps.c | 2 +- xen/common/memory.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/i386/traps.c b/xen/arch/i386/traps.c index 58ace4707e..3f8308347c 100644 --- a/xen/arch/i386/traps.c +++ b/xen/arch/i386/traps.c @@ -332,7 +332,7 @@ asmlinkage void do_page_fault(struct pt_regs *regs, long error_code) */ off = addr - LDT_VIRT_START; addr = p->mm.ldt_base + off; - if ( likely(map_ldt_shadow_page(off >> PAGE_SHIFT) == 0) ) + if ( likely(map_ldt_shadow_page(off >> PAGE_SHIFT)) ) return; /* successfully copied the mapping */ } diff --git a/xen/common/memory.c b/xen/common/memory.c index 37f6ec3294..e7caf7a60b 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -262,7 +262,7 @@ int alloc_segdesc_page(struct pfn_info *page) } -/* Map shadow page at offset @off. Returns 0 on success. */ +/* Map shadow page at offset @off. */ int map_ldt_shadow_page(unsigned int off) { struct task_struct *p = current; -- 2.30.2